Add support for psyclone 3.3, nvfortran and amdflang by sergisiso · Pull Request #338 · MetOffice/lfric_core

Sergi Siso (sergisiso) · 2026-04-20T15:44:11Z

PR Summary

Sci/Tech Reviewer:
Code Reviewer: Andrew Coughtrie (@andrewcoughtrie)

Add support for amdflang and provide workarounds for the nvfortran limitations discussed with Hacka Fett (@christophermaynard)

Also add support for the upcoming psyclone release (3.3) and update broken psyclone links and oudated names. These are not breaking changes, the code remains compabible with the current psyclone release 3.2.2.

Code Quality Checklist

I have performed a self-review of my own code
My code follows the project's style guidelines
Comments have been included that aid understanding and enhance the readability of the code
My changes generate no new warnings
All automated checks in the CI pipeline have completed successfully

Testing

I have tested this change locally, using the LFRic Core rose-stem suite
If required (e.g. API changes) I have also run the LFRic Apps test suite using this branch
If any tests fail (rose-stem or CI) the reason is understood and acceptable (e.g. kgo changes)
I have added tests to cover new functionality as appropriate (e.g. system tests, unit tests, etc.)
Any new tests have been assigned an appropriate amount of compute resource and have been allocated to an appropriate testing group (i.e. the developer tests are for jobs which use a small amount of compute resource and complete in a matter of minutes)

trac.log

Security Considerations

I have reviewed my changes for potential security issues
Sensitive data is properly handled (if applicable)
Authentication and authorisation are properly implemented (if applicable)

Performance Impact

Performance of the code has been considered and, if applicable, suitable performance measurements have been conducted

AI Assistance and Attribution

Some of the content of this change has been produced with the assistance of Generative AI tool name (e.g., Met Office Github Copilot Enterprise, Github Copilot Personal, ChatGPT GPT-4, etc) and I have followed the Simulation Systems AI policy (including attribution labels)

Documentation

Where appropriate I have updated documentation related to this change and confirmed that it builds correctly

PSyclone Approval

If you have edited any PSyclone-related code (e.g. PSyKAl-lite, Kernel interface, optimisation scripts, LFRic data structure code) then please contact the TCD Team

Sci/Tech Review

I understand this area of code and the changes being added
The proposed changes correspond to the pull request description
Documentation is sufficient (do documentation papers need updating)
Sufficient testing has been completed

(Please alert the code reviewer via a tag when you have approved the SR)

Code Review

All dependencies have been resolved
Related Issues have been properly linked and addressed
CLA compliance has been confirmed
Code quality standards have been met
Tests are adequate and have passed
Documentation is complete and accurate
Security considerations have been addressed
Performance impact is acceptable

Thomas Bendall (tommbendall)

Looks fine from a code owner perspective. I'm not sure how it was previously compiling without r_def being imported!

Sergi Siso (sergisiso) · 2026-04-21T08:46:08Z

Thomas Bendall (@tommbendall) r_def only appears in an invoke's kernel argument, and the whole expression is moved to the psy_layer where there is an unqualified constants_mod import. This happens to make the generated code valid, but we are introducing stricter symbol checking in PSyclone, which will report these undefined symbols. There are a few similar cases in lfric_apps that I will also propose fixes for.

Thomas Bendall (tommbendall) · 2026-04-21T09:59:26Z

Thomas Bendall (Thomas Bendall (@tommbendall)) r_def only appears in an invoke's kernel argument, and the whole expression is moved to the psy_layer where there is an unqualified constants_mod import. This happens to make the generated code valid, but we are introducing stricter symbol checking in PSyclone, which will report these undefined symbols. There are a few similar cases in lfric_apps that I will also propose fixes for.

That makes sense, thanks for explaining!

Matthew Hambley (MatthewHambley)

Build system code owner saying "this looks okay."

Matthew Hambley (MatthewHambley) · 2026-04-21T13:55:32Z

+# under which the code may be used.
+##############################################################################
+
+$(info ** Chosen GNU C++ compiler)


Except it says "AMD Clang" at the top.

Updated now

Matthew Hambley (MatthewHambley) · 2026-04-21T13:55:59Z

+
+$(info ** Chosen GNU C++ compiler)
+
+CXX_RUNTIME_LIBRARY=stdc++


Does the AMD compiler use the GNU C++ runtime?

No, it uses the Clang runtime, the message was a leftover from copy-pasting the GNU file.

If it uses something other than stdc++ then CXX_RUNTIME_LIBRARY needs to refer to it. Probably c++, since it's Clang based.

Sorry for the confusion, the default and recommended library for clang in Linux is -lstdc++, not -lc++, the mk is correct.

Sergi Siso (sergisiso) · 2026-05-19T09:56:04Z

Matthew Hambley (@MatthewHambley) I addressed your comments and merged with main. I don't think I can cover more bullet points form the description as I cannot launch the rose-stem tests myself, but let me know if there is something else needed.

Matthew Hambley (MatthewHambley)

Code Owner (Build System) Review: Looks like there was a minor misunderstanding.

Matthew Hambley (MatthewHambley) · 2026-05-19T13:52:59Z

+
+$(info ** Chosen GNU C++ compiler)
+
+CXX_RUNTIME_LIBRARY=stdc++


If it uses something other than stdc++ then CXX_RUNTIME_LIBRARY needs to refer to it. Probably c++, since it's Clang based.

…rans in psyclone 3.3

Sergi Siso (sergisiso) and others added 4 commits April 20, 2026 16:02

Update broken links to psyclone documentation

7474cdb

Add support for psyclone 3.3, nvfortran and amdflang

9f4b1b9

Fix nvfortran bug with polymorphic allocation

673d9d9

Sign CLA and update copyright as recommended in the contributors guide

6e11023

Sergi Siso (sergisiso) self-assigned this Apr 20, 2026

Sergi Siso (sergisiso) requested review from a team, Matthew Hambley (MatthewHambley), Iva Kavcic (TeranIvy), Mike Hobson (mike-hobson) and Thomas Bendall (tommbendall) as code owners April 20, 2026 15:44

github-actions Bot added the cla-signed The CLA has been signed as part of this PR - added by GA label Apr 20, 2026

Thomas Bendall (tommbendall) approved these changes Apr 21, 2026

View reviewed changes

Matthew Hambley (MatthewHambley) reviewed Apr 21, 2026

View reviewed changes

Sergi Siso (sergisiso) added 3 commits April 21, 2026 15:54

Fix amdclang info message

fb2c1d1

Merge branch 'main' into psyclone_next

cf8da63

Resolve merge conflict

d32792c

Sergi Siso (sergisiso) requested a review from Matthew Hambley (MatthewHambley) May 15, 2026 10:03

Matthew Hambley (MatthewHambley) requested changes May 19, 2026

View reviewed changes

Sergi Siso (sergisiso) added 2 commits May 20, 2026 13:57

Add forward-support to the new location of LFRicRedundantComputationT…

1d9acaa

…rans in psyclone 3.3

Bring to main

03b3b2b

Sergi Siso (sergisiso) requested a review from Matthew Hambley (MatthewHambley) May 20, 2026 13:11


		$(info ** Chosen GNU C++ compiler)

		CXX_RUNTIME_LIBRARY=stdc++

Conversation

Sergi Siso (sergisiso) commented Apr 20, 2026 • edited by Pierre-siddall Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

PR Summary

Code Quality Checklist

Testing

trac.log

Security Considerations

Performance Impact

AI Assistance and Attribution

Documentation

PSyclone Approval

Sci/Tech Review

Code Review

Uh oh!

Thomas Bendall (tommbendall) left a comment

Choose a reason for hiding this comment

Uh oh!

Sergi Siso (sergisiso) commented Apr 21, 2026

Uh oh!

Thomas Bendall (tommbendall) commented Apr 21, 2026

Uh oh!

Matthew Hambley (MatthewHambley) left a comment

Choose a reason for hiding this comment

Uh oh!

Matthew Hambley (MatthewHambley) Apr 21, 2026

Choose a reason for hiding this comment

Uh oh!

Sergi Siso (sergisiso) Apr 21, 2026

Choose a reason for hiding this comment

Uh oh!

Matthew Hambley (MatthewHambley) Apr 21, 2026

Choose a reason for hiding this comment

Uh oh!

Sergi Siso (sergisiso) Apr 21, 2026

Choose a reason for hiding this comment

Uh oh!

Matthew Hambley (MatthewHambley) May 19, 2026

Choose a reason for hiding this comment

Uh oh!

Sergi Siso (sergisiso) May 20, 2026

Choose a reason for hiding this comment

Uh oh!

Sergi Siso (sergisiso) commented May 19, 2026

Uh oh!

Matthew Hambley (MatthewHambley) left a comment

Choose a reason for hiding this comment

Uh oh!

Matthew Hambley (MatthewHambley) May 19, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Sergi Siso (sergisiso) commented Apr 20, 2026 •

edited by Pierre-siddall

Loading